From 475c0e74f887b9a62a82e8a80775c38f539eeb2b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 23 Apr 2004 20:01:53 +0000 Subject: [PATCH] Correctly initialize targets. (#139883, John Finlay) 2004-04-23 Matthias Clasen * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly initialize targets. (#139883, John Finlay) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkclipboard.c | 3 ++- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34ee22ae57..0e9ccbfa7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-04-23 Matthias Clasen + * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly + initialize targets. (#139883, John Finlay) + * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 34ee22ae57..0e9ccbfa7e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-04-23 Matthias Clasen + * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly + initialize targets. (#139883, John Finlay) + * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 34ee22ae57..0e9ccbfa7e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2004-04-23 Matthias Clasen + * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly + initialize targets. (#139883, John Finlay) + * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 34ee22ae57..0e9ccbfa7e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-04-23 Matthias Clasen + * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly + initialize targets. (#139883, John Finlay) + * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 34ee22ae57..0e9ccbfa7e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-04-23 Matthias Clasen + * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly + initialize targets. (#139883, John Finlay) + * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index ba48ba26b4..107b40d697 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -1095,7 +1095,8 @@ gtk_clipboard_wait_for_targets (GtkClipboard *clipboard, if (n_targets) *n_targets = 0; - targets = NULL; + if (targets) + *targets = NULL; data = gtk_clipboard_wait_for_contents (clipboard, gdk_atom_intern ("TARGETS", FALSE)); -- 2.30.2